build-sys: Adjust for merge of ostree-rs

Fix up the paths for the crates now that the Rust bindings are in
`rust/`.

We can't today include the test suite because it depends on `ostree-rs-ext`
which would make everything circular.

(Building that now requires a separate `cd tests/inst && cargo build`)

diff --git a/Cargo.toml b/Cargo.toml
index b2aa3f4e5e0ce4e28c95b4f354806dfc117d0d2c..7c849bf5c5e20ef324e842570f53840efe3c8366 100644 (file)
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,94 @@
-# Today, this repository only uses Rust for tests.  This
-# toplevel Cargo.toml helps tools like rust-analyzer understand
-# that this project contains Rust code.  We don't otherwise currently
-# use `cargo` for any part of the core build.
+[package]
+authors = ["Felix Krull"]
+description = "Rust bindings for libostree"
+documentation = "https://docs.rs/ostree"
+edition = "2018"
+keywords = ["ostree", "libostree"]
+license = "MIT"
+name = "ostree"
+readme = "README.md"
+repository = "https://github.com/ostreedev/ostree-rs"
+version = "0.13.6"
+
+exclude = [
+    "rust-bindings/conf/**",
+    "rust-bindings/gir-files/**",
+    "rust-bindings/sys/**",
+    ".gitlab-ci.yml",
+    "LICENSE.LGPL*",
+]
+
+[package.metadata.docs.rs]
+features = ["dox"]
+
+[lib]
+name = "ostree"
+path = "rust-bindings/src/lib.rs"
+
 [workspace]
-members = ["tests/inst"]
+members = [".", "rust-bindings/sys"]
+
+[dependencies]
+bitflags = "1.2.1"
+cap-std = { version = "0.24", optional = true}
+io-lifetimes = { version = "0.5", optional = true}
+ffi = { package = "ostree-sys", path = "rust-bindings/sys", version = "0.9.1" }
+gio = "0.14"
+glib = "0.14.4"
+hex = "0.4.2"
+libc = "0.2"
+once_cell = "1.4.0"
+radix64 = "0.6.2"
+thiserror = "1.0.20"
+
+[dev-dependencies]
+maplit = "1.0.2"
+openat = "0.1.19"
+tempfile = "3"
+cap-tempfile = "0.24"
+
+[features]
+cap-std-apis = ["cap-std", "io-lifetimes", "v2017_10"]
+dox = ["ffi/dox"]
+v2014_9 = ["ffi/v2014_9"]
+v2015_7 = ["v2014_9", "ffi/v2015_7"]
+v2016_3 = ["v2015_7", "ffi/v2016_3"]
+v2016_4 = ["v2016_3", "ffi/v2016_4"]
+v2016_5 = ["v2016_4", "ffi/v2016_5"]
+v2016_6 = ["v2016_5", "ffi/v2016_6"]
+v2016_7 = ["v2016_6", "ffi/v2016_7"]
+v2016_8 = ["v2016_7", "ffi/v2016_8"]
+v2016_14 = ["v2016_8", "ffi/v2016_14"]
+v2017_1 = ["v2016_14", "ffi/v2017_1"]
+v2017_2 = ["v2017_1", "ffi/v2017_2"]
+v2017_3 = ["v2017_2", "ffi/v2017_3"]
+v2017_4 = ["v2017_3", "ffi/v2017_4"]
+v2017_6 = ["v2017_4", "ffi/v2017_6"]
+v2017_7 = ["v2017_6", "ffi/v2017_7"]
+v2017_8 = ["v2017_7", "ffi/v2017_8"]
+v2017_9 = ["v2017_8", "ffi/v2017_9"]
+v2017_10 = ["v2017_9", "ffi/v2017_10"]
+v2017_11 = ["v2017_10", "ffi/v2017_11"]
+v2017_12 = ["v2017_11", "ffi/v2017_12"]
+v2017_13 = ["v2017_12", "ffi/v2017_13"]
+v2017_15 = ["v2017_13", "ffi/v2017_15"]
+v2018_2 = ["v2017_15", "ffi/v2018_2"]
+v2018_3 = ["v2018_2", "ffi/v2018_3"]
+v2018_5 = ["v2018_3", "ffi/v2018_5"]
+v2018_6 = ["v2018_5", "ffi/v2018_6"]
+v2018_7 = ["v2018_6", "ffi/v2018_7"]
+v2018_9 = ["v2018_7", "ffi/v2018_9"]
+v2019_2 = ["v2018_9", "ffi/v2019_2"]
+v2019_3 = ["v2019_2", "ffi/v2019_3"]
+v2019_4 = ["v2019_3", "ffi/v2019_4"]
+v2019_6 = ["v2019_4", "ffi/v2019_6"]
+v2020_1 = ["v2019_6", "ffi/v2020_1"]
+v2020_2 = ["v2020_1", "ffi/v2020_2"]
+v2020_4 = ["v2020_2", "ffi/v2020_4"]
+v2020_7 = ["v2020_4", "ffi/v2020_7"]
+v2020_8 = ["v2020_7", "ffi/v2020_8"]
+v2021_1 = ["v2020_8", "ffi/v2021_1"]
+v2021_2 = ["v2021_1", "ffi/v2021_2"]
+v2021_3 = ["v2021_2", "ffi/v2021_3"]
+v2021_4 = ["v2021_3", "ffi/v2021_4"]
+v2021_5 = ["v2021_4", "ffi/v2021_5"]

diff --git a/rust-bindings/Cargo.toml b/rust-bindings/Cargo.toml
deleted file mode 100644 (file)
index 1345f04..0000000
--- a/rust-bindings/Cargo.toml
+++ /dev/null
@@ -1,94 +0,0 @@
-[package]
-authors = ["Felix Krull"]
-description = "Rust bindings for libostree"
-documentation = "https://docs.rs/ostree"
-edition = "2018"
-keywords = ["ostree", "libostree"]
-license = "MIT"
-name = "ostree"
-readme = "README.md"
-repository = "https://github.com/ostreedev/ostree-rs"
-version = "0.13.7"
-
-exclude = [
-    "conf/**",
-    "gir-files/**",
-    "sys/**",
-    ".gitlab-ci.yml",
-    "LICENSE.LGPL*",
-]
-
-[package.metadata.docs.rs]
-features = ["dox"]
-
-[lib]
-name = "ostree"
-
-[workspace]
-members = [".", "sys"]
-
-[dependencies]
-bitflags = "1.2.1"
-cap-std = { version = "0.24", optional = true}
-io-lifetimes = { version = "0.5", optional = true}
-ffi = { package = "ostree-sys", path = "sys", version = "0.9.2" }
-gio = "0.14"
-glib = "0.14.4"
-hex = "0.4.2"
-libc = "0.2"
-once_cell = "1.4.0"
-radix64 = "0.6.2"
-thiserror = "1.0.20"
-
-[dev-dependencies]
-maplit = "1.0.2"
-openat = "0.1.19"
-tempfile = "3"
-cap-tempfile = "0.24"
-
-[features]
-cap-std-apis = ["cap-std", "io-lifetimes", "v2017_10"]
-dox = ["ffi/dox"]
-v2014_9 = ["ffi/v2014_9"]
-v2015_7 = ["v2014_9", "ffi/v2015_7"]
-v2016_3 = ["v2015_7", "ffi/v2016_3"]
-v2016_4 = ["v2016_3", "ffi/v2016_4"]
-v2016_5 = ["v2016_4", "ffi/v2016_5"]
-v2016_6 = ["v2016_5", "ffi/v2016_6"]
-v2016_7 = ["v2016_6", "ffi/v2016_7"]
-v2016_8 = ["v2016_7", "ffi/v2016_8"]
-v2016_14 = ["v2016_8", "ffi/v2016_14"]
-v2017_1 = ["v2016_14", "ffi/v2017_1"]
-v2017_2 = ["v2017_1", "ffi/v2017_2"]
-v2017_3 = ["v2017_2", "ffi/v2017_3"]
-v2017_4 = ["v2017_3", "ffi/v2017_4"]
-v2017_6 = ["v2017_4", "ffi/v2017_6"]
-v2017_7 = ["v2017_6", "ffi/v2017_7"]
-v2017_8 = ["v2017_7", "ffi/v2017_8"]
-v2017_9 = ["v2017_8", "ffi/v2017_9"]
-v2017_10 = ["v2017_9", "ffi/v2017_10"]
-v2017_11 = ["v2017_10", "ffi/v2017_11"]
-v2017_12 = ["v2017_11", "ffi/v2017_12"]
-v2017_13 = ["v2017_12", "ffi/v2017_13"]
-v2017_15 = ["v2017_13", "ffi/v2017_15"]
-v2018_2 = ["v2017_15", "ffi/v2018_2"]
-v2018_3 = ["v2018_2", "ffi/v2018_3"]
-v2018_5 = ["v2018_3", "ffi/v2018_5"]
-v2018_6 = ["v2018_5", "ffi/v2018_6"]
-v2018_7 = ["v2018_6", "ffi/v2018_7"]
-v2018_9 = ["v2018_7", "ffi/v2018_9"]
-v2019_2 = ["v2018_9", "ffi/v2019_2"]
-v2019_3 = ["v2019_2", "ffi/v2019_3"]
-v2019_4 = ["v2019_3", "ffi/v2019_4"]
-v2019_6 = ["v2019_4", "ffi/v2019_6"]
-v2020_1 = ["v2019_6", "ffi/v2020_1"]
-v2020_2 = ["v2020_1", "ffi/v2020_2"]
-v2020_4 = ["v2020_2", "ffi/v2020_4"]
-v2020_7 = ["v2020_4", "ffi/v2020_7"]
-v2020_8 = ["v2020_7", "ffi/v2020_8"]
-v2021_1 = ["v2020_8", "ffi/v2021_1"]
-v2021_2 = ["v2021_1", "ffi/v2021_2"]
-v2021_3 = ["v2021_2", "ffi/v2021_3"]
-v2021_4 = ["v2021_3", "ffi/v2021_4"]
-v2021_5 = ["v2021_4", "ffi/v2021_5"]
-v2022_2 = ["v2021_5", "ffi/v2022_2"]

diff --git a/tests/inst/Cargo.toml b/tests/inst/Cargo.toml
index 70e56dc585d579d8a1e7ab09f185cf2a6881ebb2..cf9c2dcc0144693c0551051715f67cc89388fb03 100644 (file)
--- a/tests/inst/Cargo.toml
+++ b/tests/inst/Cargo.toml
@@ -4,6 +4,8 @@ version = "0.1.0"
 authors = ["Colin Walters <walters@verbum.org>"]
 edition = "2018"
 
+[workspace]
+
 [[bin]]
 name = "ostree-test"
 path = "src/insttestmain.rs"